Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Oct 9, 2025

Backport of #55080

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot requested review from artonge, come-nc and nfebe October 9, 2025 06:43
@backportbot backportbot bot added this to the Nextcloud 31.0.10 milestone Oct 9, 2025
Copy link
Contributor

@nfebe nfebe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requires update, backport incomplete.

@nfebe
Copy link
Contributor

nfebe commented Oct 21, 2025

Requires : #55893

@nfebe nfebe marked this pull request as ready for review November 11, 2025 08:25
@nfebe nfebe force-pushed the backport/55080/stable31 branch from 79a089e to 8574a0a Compare November 11, 2025 08:26
When `show_federated_shares_to_trusted_servers_as_internal` is enabled
but `show_federated_shares_as_internal` is not, filter federated share
suggestions to only include trusted servers. Previously, searching for
an email address would suggest non-trusted federated servers.

Resolved: #54511
Signed-off-by: nfebe <[email protected]>
The federation app is not always installed, causing errors when
TrustedServers is injected as a hard dependency. This change makes
the dependency optional by using nullable types and null-safe
operators, defaulting to false when unavailable.

Modified backport of #55893 which are required for
the stable31 backport to function correctly.

Signed-off-by: nfebe <[email protected]>
@nfebe nfebe force-pushed the backport/55080/stable31 branch from 8574a0a to 6a1fdf5 Compare November 11, 2025 11:09
@nfebe
Copy link
Contributor

nfebe commented Nov 11, 2025

/compile

Signed-off-by: nextcloud-command <[email protected]>
@nfebe nfebe merged commit 28fbe23 into stable31 Nov 11, 2025
197 of 212 checks passed
@nfebe nfebe deleted the backport/55080/stable31 branch November 11, 2025 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants